From: Sebastian Kemper Date: Tue, 17 Jul 2018 21:26:20 +0000 (+0200) Subject: asterisk-chan-sccp: remove iconv hack X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22http:/www.crowdsec.net/%22/%22https:/collectd.org/%22http:/www.crowdsec.net/%22?a=commitdiff_plain;h=e45e405487a109ac0aca83bbd5be5af29e26716e;p=feed%2Ftelephony.git asterisk-chan-sccp: remove iconv hack Instead just include nls.mk. Signed-off-by: Sebastian Kemper --- diff --git a/net/asterisk-chan-sccp/Makefile b/net/asterisk-chan-sccp/Makefile index 38f82be..06ce1a1 100644 --- a/net/asterisk-chan-sccp/Makefile +++ b/net/asterisk-chan-sccp/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=chan-sccp PKG_VERSION:=v4.3.0-20180322 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/chan-sccp/chan-sccp.git @@ -30,14 +30,8 @@ PKG_INSTALL:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk - -# musl and glibc include their own iconv, but uclibc does not -ifneq ($(CONFIG_USE_UCLIBC),) -TARGET_CPPFLAGS+= \ - -I$(STAGING_DIR)/usr/lib/libiconv-full/include -TARGET_LDFLAGS+= \ - -L$(STAGING_DIR)/usr/lib/libiconv-full/lib -liconv -endif +# chan-sccp needs iconv +include $(INCLUDE_DIR)/nls.mk define Package/chan-sccp/Default SUBMENU:=Telephony @@ -45,8 +39,7 @@ define Package/chan-sccp/Default CATEGORY:=Network TITLE:=SCCP channel support URL:=https://github.com/chan-sccp/chan-sccp - DEPENDS:=+USE_UCLIBC:libiconv-full +libltdl - PKG_BUILD_DEPENDS:=libiconv + DEPENDS:=$(ICONV_DEPENDS) +libltdl endef define Package/asterisk13-chan-sccp